Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Apr 2010 23:20:37 +0000 (23:20 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 14 Apr 2010 23:20:37 +0000 (23:20 +0000)

Trivial merge